Timespinner: support new flags and settings from the randomizer #4559
Conversation
… in upstream settings
github-actions
bot
added
affects: webhost
| } | ||
| #inventory-table img.acquired.crimson{ /*DB143B*/ | ||
| filter: hue-rotate(348deg) saturate(8.3) brightness(0.47); | ||
| } |
There was a problem hiding this comment.
These three colours are the same as those used by the randomiser's item tracker for the three Laser Access items.
|
|
||
| if options.inverted: | ||
| if options.inverted or (options.pyramid_start and not options.back_to_the_future): |
There was a problem hiding this comment.
Strictly speaking this doesn't match the in-randomiser logic (which will allow both past and present for pyramid start mode based on my understanding), but generation tends to fail out if I don't restrict this case to present gates.
| @@ -125,7 +125,7 @@ def create_regions_and_locations(world: MultiWorld, player: int, options: Timesp | |||
| connect(world, player, 'Sealed Caves (Xarion)', 'Skeleton Shaft') | |||
| connect(world, player, 'Sealed Caves (Xarion)', 'Space time continuum', logic.has_teleport) | |||
| connect(world, player, 'Refugee Camp', 'Forest') | |||
| connect(world, player, 'Refugee Camp', 'Library', lambda state: options.inverted and options.back_to_the_future and state.has_all({'Timespinner Wheel', 'Timespinner Spindle'}, player)) | |||
| connect(world, player, 'Refugee Camp', 'Library', lambda state: (options.pyramid_start or options.inverted) and options.back_to_the_future and state.has_all({'Timespinner Wheel', 'Timespinner Spindle'}, player)) | |||
There was a problem hiding this comment.
In-rando logic checks for "not present start", encompassing both pyramid start and inverted.
| @@ -162,9 +162,12 @@ def create_regions_and_locations(world: MultiWorld, player: int, options: Timesp | |||
| connect(world, player, 'Royal towers (upper)', 'Royal towers') | |||
| #connect(world, player, 'Ancient Pyramid (entrance)', 'The lab (upper)', lambda state: not is_option_enabled(world, player, "EnterSandman")) | |||
| connect(world, player, 'Ancient Pyramid (entrance)', 'Ancient Pyramid (left)', logic.has_doublejump) | |||
| connect(world, player, 'Ancient Pyramid (entrance)', 'Space time continuum', logic.has_teleport) | |||
There was a problem hiding this comment.
These are here to support pyramid start.
| @@ -376,7 +388,8 @@ def assign_starter_item(self, excluded_items: Set[str], location: str, item_list | |||
| self.place_locked_item(excluded_items, location, item_name) | |||
|
|
|||
| def place_first_progression_item(self, excluded_items: Set[str]) -> None: | |||
| if self.options.quick_seed or self.options.inverted or self.precalculated_weights.flood_lake_desolation: | |||
| if (self.options.quick_seed or self.options.inverted or self.precalculated_weights.flood_lake_desolation) \ | |||
| and not self.options.pyramid_start: | |||
There was a problem hiding this comment.
Enabling the early progression placement here to allow pyramid start seeds to generate faster (there are all of three checks open initially).
ScipioWright
added
waiting-on: world-maintainer
worlds/timespinner/Locations.py
Outdated
| LocationData('The lab (power off)', 'Lab: Middle terminal (Amadeus Laboratory Map)', 1337166, lambda state: state.has('Tablet', player)), | ||
| LocationData('The lab (power off)', 'Lab: Sentry platform terminal (Origins)', 1337167, lambda state: state.has('Tablet', player)), | ||
| LocationData('The lab (power off)', 'Lab: Middle terminal (Amadeus Laboratory Map)', 1337166, lambda state: state.has('Tablet', player) and (not options.lock_key_amadeus or state.has('Lab Access Research', player))), | ||
| LocationData('The lab (power off)', 'Lab: Sentry platform terminal (Origins)', 1337167, lambda state: state.has('Tablet', player) and (not options.lock_key_amadeus or state.has('Lab Access Research', player))), |
There was a problem hiding this comment.
- This matches the upstream logic, but I think this is incorrect - the room this is in is gated behind Lab Access Genza, not Lab Access Research. Check upstream and update the other PR too if needed.
There was a problem hiding this comment.
I've changed this here, but I need to verify that the problem is what I think it is and also fix in the main rando if so.
There was a problem hiding this comment.
Rando PR has been updated with the fix.
Per PR suggestion. Co-authored-by: Scipio Wright <[email protected]>
…unt for a Risky Warps case
| {% endif %} | ||
| {% if 'GateKeep' in options %} | ||
| <div class="C3"> | ||
| <span class="{{ 'acquired' if 'Drawbridge Key' in acquired_items }}" title="Lab Access Experiment">❖</span> |
There was a problem hiding this comment.
There didn't seem to be a suitable icon for the sprite I used for the Drawbridge Key available from the source of the rest of the icons, so I'm emulating it with a ❖ character instead. The collected version looks like this:
What is this fixing or adding?
Several flags and settings have been added to recent releases of the Timespinner randomiser; this pull requests updates the apworld to support those flags and settings. There is a companion pull request for the randomiser itself, Jarno458/TsRandomizer#164, to properly support a couple of the new flags and settings here.
How was this tested?
Rolled several seeds locally to check logic. Ran webhost to verify updates to the tracker. Played through a webhosted seed to verify general functionality (and tracker updates).
If this makes graphical changes, please attach screenshots.
Since the above screenshot was posted, I've adjusted the colours of the laser access items (lower left corner) to look better and more closely match what the upstream item tracker shows. Here's how they currently appear:
